Updates for reproducibility & consistency