commands re-arranged