Improvements on the front end