Applied Asp's additions to the Master.