Changed the ca handling