more changes to reflect division for front end common