updated with correction from Tracy