tidied up for week2 demo to bingbing