Added and made addl changes