Satya -  bug fixes

 UAT18 and riders cell