pulling newest updates into models branch