merge with Hari