some changes to #4