Adam changes pre April 29
Merge branch 'adamnadel'