Made some changes`