Final commit with all issue fixed