Continued work on Y_OFFSET_FACTOR