updates suggested by Cyril