Changing example project and improving scenarios