replaced the rest of the instance calls with server