upgrade some commands to new way of doing things