finished merge of Max/Alex work into develop