Isaac changes merged