updated the grid values in core and updated teh fill-color function in square
updated with merge