Bringing back main bootstrap with proper naming