final changes on front end