additional changes motivated by Azalee