In this commit focus is on things that matters