DONE improve usability