Changed places/network-server-database accroding to issue #8