Too many changes for one commit