changes to #3