Tremendous improvements

Wee Teck
TJC