backend Changes as asked by surya