retooled some stuff to make it more evocative