big upgrade to usability