Updated offsets for better accuracy