first commit of my modified version