Some refactoring. Somehow this BROKE M1