total fix and changes 2