Moved emits back to it's proper place