Few changes, work is in progres..