updated with changes from intial review