changes from NPO - JUST and LL & COMMAND changed