small changes so that it works as addon to different server