Updated demo, prettier code
Updated emo