Make general server work as I wanted...