Hassan's changes to improve usability.