made some changes per Lydia's request