Kolkar resistance fix port to new repo