changed ORG to SYSTEM and added if for POWERBASH_SHORT_NUM