added some stuff from last week...