Added support for down/up