Joanna's latest build merged