move it in commands list too