Improve notation
Update use of Halcyon