Added basaks server changes