Changed cert. handling