minor changes from discussion with Ana and Jarrett for adding a choice