Jan Lam (May 29, 08) DONE - charing