Final commit from my side