added more front end goodness