update before merge
merges Micah's changes