Pooja/Khushal: fixed spec