Some minor modifications. Trying to kill some time.