last version before reverting to 2006 equations