(Cal) Performance optimzations on cal