changed rich as per Yigabar's request
added simmonsisfinished's changes to vicki