First commit of updated version