Removed the reset, moved everything to initialized