Updates from v0.42ST'