More changes and addtion...