made changes here & there