Modified everything but Eq 10