Added isServer variable