RobL: changes for silicon milk