update based on biju fixes