Updated to be more accurate