Now uses indexPathForCell: method