added support for non-portable version
now supports both portable and none versions