Added first functioning version