Updated both back-end & front-end