try to merge with paul #2