Some midfication to make it more advance and introduce angular js