Application demo done t2
Application demo done t3
Fix merge conflicts