Changes to front-end side of code