Front end changes and back end test