merge with paul try #3