Working on updates for usability