Replaced complex form with core function vals.