removed bugs due to streamlining commands