added moving point handling to units