Fix 110% and remove pun-based task