Updating.. Still need to fix some event handlers