9.13 + 9.9 Update

Added in main method.