Design circa 2003
Merge branch 'rl'