Final code push for celerity