merged flashdemo repo