Added better handling of Tahna Los
Added better handling of Quark