changes from MikeW