Event setup moved to new code.