Modified front-end and backend