Another sever overhaul