#4 working on integrated server