better handling the row