Code now should fit Tomahawk's standard