Want to make COMAP better?