changed front end
merged files