the extended equations are better now