updated handlers - passed 7/15 qual tests (skipped 6)