general changes and updated