added server and console