Improve Y mapping