Updated to allow for cell editing