Fixing few things in discussion..