Added a better user interface