ditched all bundle b.s.