Updated Server v1.6

Updated and Group work