the commit before merging with shane