Updated front end