Updated general usability