A merge and replacement of the 2 old Citius ones