Better handling (27/40)

Better handling