Added updated front-end