1. Worked a bit on failure handling