Fixed 7
Refactoring with 2 dim array