Added escaping and velocity
Added escaping and version of velocity