More bill model changes