Some change from my side ...