Upgraded the portable version similar to app version