more changes to #3