recomitting some of the changes. git confusion at its best