Added server checking as single part