modifications after first pass of front end code