fewer commits, hopefully faster