Changes from Kristopher Live server