Made some significant internal changes.