Final changes before messing with hosting