#13 Final changes that complete the changes.  Warning doesn't come up anymore