Things seem to be working
Merge branch 'eric' into noj