Removed Server
Added legend