added onCommand