Kevin -> Simon library conversion