Finished modifying logic for WitchCard