Reworked and added server