Major Changes made