field tested but unchecked changes, review ASAP