removed vector2 typedef