Code update to ISSUE:Scrolling does retain cell state