Got some more rewriting taken care of