worked with the advanced server
final commit