Updated w.r.t. review #1