changes according to sw review