incorporate changes from Kaitlin