tweaks by Irene