Comments added for front-end