Added in luke changes done manually on the server (As requested by
chrarlie)