Final commit with all failure corrections