Updated structure
Added grid