minor refactoring
resolve MC locally.. again