merging with jeff branch