Made progress on certificates