Rearranged methods in Emitter to follow a top to bottom approach