Changes b.02

Near final