added some stuff from the ultimate package