Added changes made during Boulderactive