Better handling (8/40)

Better handling