Fixes #5, updating for All's Well that Maxwell.