some further superficial changes by Janis