improved program and charge models