Implemented Z rotation velcoity based, needs tweaking