Some more changes in front end