Made some changes(something of a hack) in order to enable velocity control