Some changes to smush system