updates master with Karls changes