Added support for bunny-hopping