Mistakes undone
After few more chnges