Upstream re-design

by Thanos Papavasiliou