still fixing velocity