in process of fixing vector rotation
merge problems