changed handling of one-body problem to more convenient notation