Added portable mode