major extension complete, not tested