Added Kadira back in, it is working well