updated with more custom cmds