Mostly internal changes this time