final trebuchet fix