working through comments from Annette