Front end

Updated requested changes.