added cancels and other good stuff