Hari - some small changes