shattering improvements