server rework with no lib