bug squashing 1.0