removed redundancies
updated demo