revising front-end