Updated start for new upstream changes