made the mogen templates more Swiftly