Deleted upstream + changed addStuff()