removed sub command system.. buggy