Revision of work begun in CSC 130