new structure, added server