Speed calculation moved to object itself