preparing for merge with jeffs branch