Changed from pulling server data from  to using services