reverting to shubham code