Added a little bit more thought to the front end