Redone a lot of onCommand