Pretty much sorted issues with new matt mechanics