Adressed CR comments