updated with Barbara's changes