Change return statements
Change to use 2d array