Finally added end-support for input button action