TESTED: Minor adjustments to the thrower code