5.13 updates to baseline code