improved usability a bit