Make it two commits