added changes according to Caitlin request