Change to new commands :)