Some changes to keep it online safely