Attempting to make it more accurate