added more kapil stuff