upload latest code design from Leo Yan
new