Redid commit for merge