With startup refactor