Initial changes. I will track properly going forward