final changes in front end