refactoring, added MC2020, fixed issue #1