Reduced the amount of calls to the server