Updated: Changed parameters in onCommand