Added grid option