starting adaptation for sever 2.0