added YDist
cleanup