commit before merging with Eric