[IMPROVE] Front-end update