merged from justins changes