added some stuff from kmom02