changes from Shane