Restructuring/update by Convair880/Pistoleer.