Further front end changes