Took out unnecessary fireEvents