Added more changes - harsha