changes from Andrew + Andy