adding in the rest of the goodies