more logic changes, jim