Final of demo app 2.3.5