Updated w.r.t. Manlove comments