Finished 544, minor revisions to 359