still fixing commit issues