Refactored MCSub