started rewriting

Signed-off-by: Arif <arif@bansberrysg.com>