Refactored in new enum SubCell