This is simpler and should be more accurate anyways