working on stand-alone
stand-alone changes done