Updated with latest murcko patches