Self Quote part 1

Those changes