some changes to previous answers