Refactored the less to give more accurate results