Changed a fair bit server side