Added old command and improved it