Adam inner controls
Long description
Merge branch 'adamnadel'