some changes to #3