general issues with "only" placement, here and elsewhere: e.g. should be moved to before the "if" here