added stuff from butters