BETA - Fix Grid - DONE