Added front end changes