changes for hosted version