Reintegrated improvements from customware implementation