fixing issues shenoi uncovered