refactor under_thump