minor change to #4, add #5