merge with master and kendalls fix