SO updated code added