Edited Server for project 8 version (final version)