Better handling (15/40)

Better handling