Front end changes 2