Final draft

Signed-off-by: erictsoi <ericchiwaitsoi@hotmail.com>