Initial commit of updated version