restored Manu's idea