updated to pull from server