diff --git a/src/derived-states.js b/src/derived-states.js
index 109583c..ba09875 100644
--- a/src/derived-states.js
+++ b/src/derived-states.js
@@ -8,69 +8,85 @@ See the accompanying LICENSE file for terms.
 // this will eventually move to context parser and it will not be a sparse matrix
 // Transition table based on https://html.spec.whatwg.org/multipage/syntax.html
 var DerivedState = {};
+
+/*
+// used to generate DerivedState.Transitions 
 DerivedState.TransitionsSparse = {
-    1:  {1: 1},
-    10: {1: 2, 43: 6},
-    13: {43: 6},
-    16: {43: 6},
-    19: {43: 6},
-    27: {43: 6},
-    34: {1: 2, 43: 6},
-    35: {1: 2, 36: 3, 43: 6},
-    36: {1: 2, 43: 6},
-    38: {42: 4},
-    39: {42: 4},
-    40: {1: 2, 34: 4},
-    42: {1: 2, 43: 6},
-    43: {1: 2},
+    1:  {1: 0x10},
+    10: {1: 0x20},
+    34: {1: 0x20},
+    35: {1: 0x20 + 4, 36: 4, 43: 4},
+    36: {1: 0x20 + 4},
+    38: {42: 1},
+    39: {42: 2},
+    40: {1: 0x20 + 3, 34: 3},
+    42: {1: 0x20},
+    43: {1: 0x20}
 };
+*/
 
 DerivedState.TransitionName = {};
 
+
+/*
+ * the last 3 bits represents NO_ACTION and 4 Attribute Value Actions
+ * each of them is mutally exclusive, but can be compounded with other actions
+ */
 // do nothing in the postWalk callback, input will be filtered out (default case)
 DerivedState.TransitionName.NO_ACTION = 0;
+// collect double-quoted attr value
+DerivedState.TransitionName.DQ_ATTR = 1; // or b0001
+// collect single-quoted attr value
+DerivedState.TransitionName.SQ_ATTR = 2; // or b0010
+// collect unquoted attr value
+DerivedState.TransitionName.UQ_ATTR = 3; // or b0011
+// collect tag only attr
+DerivedState.TransitionName.NV_ATTR = 4; // or b0100
+
 
+/*
+ * begining from the 5th significant bit, there're mutually-exclusive actions:
+ */
 // append the input to the output buffer,
 // the output buffer will be returned in the purify function call
-DerivedState.TransitionName.WITHIN_DATA = 1;
-
-// core logic to handle the tagName, attribute and its value
-DerivedState.TransitionName.FROM_TAG_ATTR_TO_DATA = 2;
+DerivedState.TransitionName.WITHIN_DATA = 0x10;              // or b010000
 
-// initialize/clean up the attribute value
-DerivedState.TransitionName.ATTR_TO_AFTER_ATTR = 3;
-
-// map the attribute value to the attribute name
-DerivedState.TransitionName.ATTR_VAL_TO_AFTER_ATTR_VAL = 4;
-
-// append the '<' with next char for markup declaration open state
-//DerivedState.TransitionName.TAG_OPEN_TO_MARKUP_OPEN = 5;
+// core logic to output tags and attrs
+DerivedState.TransitionName.FROM_TAG_ATTR_TO_DATA = 0x20;    // or b100000
 
 // set the self closing tag if solidus is encountered
-DerivedState.TransitionName.TO_SELF_CLOSING_START = 6;
+// DerivedState.TransitionName.TO_SELF_CLOSING_START = 0x30; // or b110000
 
+/*
+// To generate Transitions from TransitionsSparse
+var max = 54, arr = JSON.parse(JSON.stringify(new Array(max))).map(function(){return 0}), ret;
+ret = arr.slice().map(function(){return arr.slice();});
+Object.keys(TransitionsSparse).forEach(function(k1){Object.keys(TransitionsSparse[k1]).forEach(function(k2){ console.log(k1,k2); ret[k1][k2] = TransitionsSparse[k1][k2]; }); });
+JSON.stringify(ret).replace(/,(\d)([,\]])/g, ', $1$2').replace(/,(\d)([,\]])/g, ', $1$2').replace(/\],\[/g, '],\n\t[').replace('[[', '[\n\t[').replace(']]', ']\n]');
+*/
 
 DerivedState.Transitions = [
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-    [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0,32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-    [0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
@@ -78,23 +94,22 @@ DerivedState.Transitions = [
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-    [0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-    [0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-    [0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0,32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0,36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0,36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-    [0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0,35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-    [0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-    [0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0,32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0,32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
diff --git a/src/html-purify.js b/src/html-purify.js
index 21fe11d..b0c0e74 100755
--- a/src/html-purify.js
+++ b/src/html-purify.js
@@ -9,7 +9,8 @@ See the accompanying LICENSE file for terms.
     var Parser = require('context-parser').Parser,
         tagAttList = require("./tag-attr-list"),
         derivedState = require('./derived-states.js'),
-        xssFilters = require('xss-filters'),
+        yubl = require('xss-filters')._privFilters.yubl,
+        uriBlacklistFilter = function(s){ return yubl(s.replace(/\x00/g, '%00')); },
         CssParser = require('css-js'),
         hrefAttribtues = tagAttList.HrefAttributes,
         voidElements = tagAttList.VoidElements;
@@ -51,14 +52,57 @@ See the accompanying LICENSE file for terms.
         return false;
     }
 
+    function addQuoteToValue(attrAction, value) {
+        if (attrAction === derivedState.TransitionName.DQ_ATTR) {         // collect double quoted value
+            return '"' + value + '"';
+        } 
+        else if (attrAction === derivedState.TransitionName.SQ_ATTR) {    // collect single quoted value
+            return "'" + value + "'";
+        } 
+        else /*if (attrAction === derivedState.TransitionName.UQ_ATTR) {  // collect unquoted value */{
+            return value;
+        }
+    }
+
     function processTransition(prevState, nextState, i) {
         /* jshint validthis: true */
         /* jshint expr: true */
         var parser = this.parser,
+            action = derivedState.Transitions[prevState][nextState],
+            attrAction = action & 0xF,
             idx, tagName, attrValString, openedTag, key, value;
 
-        
-        switch (derivedState.Transitions[prevState][nextState]) {
+        // check if tag and/or attr is available for collection
+        // collect the values (if any) only when the attr name is allowed
+        if (attrAction && contains(this.attributesWhitelist, (key = parser.getAttributeName()))) {
+
+            // collect the attr name only
+            // boolean attributes may not have a value
+            if (attrAction === derivedState.TransitionName.NV_ATTR) {
+                this.attrVals[key] = null;
+            }
+            // collect both the attr name and value
+            else {
+                value = parser.getAttributeValue() || '';
+
+                // store only valid style attribute value
+                if (key === 'style') {
+                    if (this.cssParser.parseCssString(value)) {
+                        this.attrVals[key] = addQuoteToValue(attrAction, value);
+                    }
+                } 
+                // apply the blacklist filter for URI attr value
+                else if (hrefAttribtues[key]) {
+                    this.attrVals[key] = addQuoteToValue(attrAction, uriBlacklistFilter(value));
+                }
+                else {
+                    this.attrVals[key] = addQuoteToValue(attrAction, value);
+                }
+            }
+        }
+
+        // mask out the last 4 bits that represent attr value action
+        switch (action & 0xF0) {
             
         case derivedState.TransitionName.WITHIN_DATA:
             this.output += parser.input[i];
@@ -87,69 +131,31 @@ See the accompanying LICENSE file for terms.
                 }
                 else {
                     //  - void elements only have a start tag; end tags must not be specified for void elements.
-                    this.hasSelfClosing = this.hasSelfClosing || voidElements[tagName];
+                    this.hasSelfClosing = /*this.hasSelfClosing ||*/ voidElements[tagName];
 
                     // push the tagName into the openedTags stack if not found:
                     //  - a self-closing tag or a void element
                     this.config.enableTagBalancing && !this.hasSelfClosing && this.openedTags.push(tagName);
 
-                    if (prevState === 35 ||
-                        prevState === 36 ||
-                        prevState === 40) {
-                        this.attrVals[parser.getAttributeName()] = parser.getAttributeValue();
-                    }
-
+                    // output all allowed attr names and values
                     attrValString = '';
                     for (key in this.attrVals) {
-                        if (contains(this.attributesWhitelist, key)) {
-                            value = this.attrVals[key];
-
-                            if (key === "style") { // TODO: move style to a const
-                                if (value === null) {
-                                    attrValString += ' ' + key + '=""';
-                                }
-                                else if (this.cssParser.parseCssString(value)) {
-                                    attrValString += ' ' + key + '="' + value + '"';
-                                }
-                                continue;
-                            }
-
-                            attrValString += ' ' + key;
-                            if (value !== null) {
-                                attrValString += '="' + (hrefAttribtues[key] ? xssFilters.uriInDoubleQuotedAttr(decodeURI(value)) : value) + '"';
-                            }
-                        }
+                        value = this.attrVals[key];
+                        attrValString += (value === null) ? ' ' + key : ' ' + key + '=' + value;
                     }
 
                     // handle self-closing tags
                     this.output += '<' + tagName + attrValString + (this.hasSelfClosing ? ' />' : '>');
-
                 }
             }
             // reinitialize once tag has been written to output
             this.attrVals = {};
-            this.hasSelfClosing = 0;
-            break;
-
-        case derivedState.TransitionName.ATTR_TO_AFTER_ATTR:
-            this.attrVals[parser.getAttributeName()] = null;
+            // this.hasSelfClosing = false;
             break;
 
-        case derivedState.TransitionName.ATTR_VAL_TO_AFTER_ATTR_VAL:
-            this.attrVals[parser.getAttributeName()] = parser.getAttributeValue() || '';
-            break;
-
-        //case derivedState.TransitionName.TAG_OPEN_TO_MARKUP_OPEN:
-        //    this.output += "<" + parser.input[i];
-	    //    break;
-
-        case derivedState.TransitionName.TO_SELF_CLOSING_START:
-            // boolean attributes may not have a value
-            if (prevState === 35) {
-                this.attrVals[parser.getAttributeName()] = null;
-            }
-            this.hasSelfClosing = 1;
-            break;
+        // case derivedState.TransitionName.TO_SELF_CLOSING_START:
+        //     this.hasSelfClosing = true;
+        //     break;
         }
     }
 
@@ -159,7 +165,7 @@ See the accompanying LICENSE file for terms.
         that.output = '';
         that.openedTags = [];
         that.attrVals = {};
-        that.hasSelfClosing = 0;
+        // that.hasSelfClosing = false;
         that.parser.reset();
         that.parser.contextualize(data);
 
diff --git a/tests/test-vectors.js b/tests/test-vectors.js
index 7db885a..420b620 100644
--- a/tests/test-vectors.js
+++ b/tests/test-vectors.js
@@ -55,7 +55,7 @@ var html5secVectors = [
 {
 	id: 10,
 	input: "<video poster=javascript:alert(1)//></video>",
-	output: "<video poster=\"x-javascript:alert(1)//\"></video>"
+	output: "<video poster=x-javascript:alert(1)//></video>"
 },
 {
 	id: 11,
@@ -75,7 +75,7 @@ var html5secVectors = [
 {
 	id: 14,
 	input: "<input pattern=^((a+.)a)+$ value=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!>",
-	output: "<input pattern=\"^((a+.)a)+$\" value=\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!\" />"
+	output: "<input pattern=^((a+.)a)+$ value=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! />"
 },
 {
 	id: 15,
@@ -120,7 +120,7 @@ var html5secVectors = [
 {
 	id: 23,
 	input: "<form id=test onforminput=alert(1)><input></form><button form=test onformchange=alert(2)>X</button>",
-	output: "<form id=\"test\"><input /></form><button form=\"test\">X</button>"
+	output: "<form id=test><input /></form><button form=test>X</button>"
 },
 {
 	id: 24,
@@ -180,7 +180,7 @@ var html5secVectors = [
 {
 	id: 35,
 	input: "1<a href=#><line xmlns=urn:schemas-microsoft-com:vml style=behavior:url(#default#vml);position:absolute href=javascript:alert(1) strokecolor=white strokeweight=1000px from=0 to=1000 /></a>",
-	output: "1<a href=\"#\"></a>"
+	output: "1<a href=#></a>"
 },
 {
 	id: 36,
@@ -190,32 +190,32 @@ var html5secVectors = [
 {
 	id: 37,
 	input: "<!--<img src=\"--><img src=x onerror=alert(1)//\">",
-	output: "<img src=\"x\" />"
+	output: "<img src=x />"
 },
 {
 	id: 38,
 	input: "<comment><img src=\"</comment><img src=x onerror=alert(1)//\">",
-	output: "<img src=\"%3C/comment%3E%3Cimg%20src=x%20onerror=alert(1)//\" />"
+	output: "<img src=\"</comment><img src=x onerror=alert(1)//\" />"
 },
 { 
 	id: 39, // TODO: confirm (this and certain doctype, xml ones)
 	input: "<!-- up to Opera 11.52, FF 3.6.28 -->\r\n<![><img src=\"]><img src=x onerror=alert(1)//\">\r\n\r\n<!-- IE9+, FF4+, Opera 11.60+, Safari 4.0.4+, GC7+ -->\r\n<svg><![CDATA[><image xlink:href=\"]]><img src=xx:x onerror=alert(2)//\"></svg>",
-	output: "\n<img src=\"%5D%3E%3Cimg%20src=x%20onerror=alert(1)//\" />\n\n\n"
+	output: "\n<img src=\"]><img src=x onerror=alert(1)//\" />\n\n\n"
 },
 {
 	id: 40,
 	input: "<style><img src=\"</style><img src=x onerror=alert(1)//\">",
-	output: "<img src=\"x\" />"
+	output: "<img src=x />"
 },
 {
 	id: 41,
 	input: "<li style=list-style:url() onerror=alert(1)></li>\n<div style=content:url(data:image/svg+xml,%3Csvg/%3E);visibility:hidden onload=alert(1)></div>",
-	output: "<li style=\"list-style:url()\"></li>\n<div style=\"content:url(data:image/svg+xml,%3Csvg/%3E);visibility:hidden\"></div>"
+	output: "<li style=list-style:url()></li>\n<div style=content:url(data:image/svg+xml,%3Csvg/%3E);visibility:hidden></div>"
 },
 {
 	id: 42,
 	input: "<head><base href=\"javascript://\"/></head><body><a href=\"/. /,alert(1)//#\">XXX</a></body>",
-	output: "<head><base href=\"x-javascript://\" /></head><body><a href=\"/.%20/,alert(1)//#\">XXX</a></body>"
+	output: "<head><base href=\"x-javascript://\" /></head><body><a href=\"/. /,alert(1)//#\">XXX</a></body>"
 },
 {
 	id: 43,
@@ -355,7 +355,7 @@ var html5secVectors = [
 {
 	id: 71,
 	input: "<div style=width:1px;filter:glow onfilterchange=alert(1)>x</div>",
-	output: "<div style=\"width:1px;filter:glow\">x</div>"
+	output: "<div style=width:1px;filter:glow>x</div>"
 },
 {
 	id: 72,
@@ -455,7 +455,7 @@ var html5secVectors = [
 {
 	id: 91,
 	input: "<!-- Up to Opera 10.63 -->\r\n<div style=content:url(test2.svg)></div>\r\n\r\n<!-- Up to Opera 11.64 - see link below -->\r\n\r\n<!-- Up to Opera 12.x -->\r\n<div style=\"background:url(test5.svg)\">PRESS ENTER</div>",
-	output: "\n<div style=\"content:url(test2.svg)\"></div>\n\n\n\n\n<div style=\"background:url(test5.svg)\">PRESS ENTER</div>"
+	output: "\n<div style=content:url(test2.svg)></div>\n\n\n\n\n<div style=\"background:url(test5.svg)\">PRESS ENTER</div>"
 },
 {
 	id: 92,
@@ -490,12 +490,12 @@ var html5secVectors = [
 {
 	id: 98,
 	input: "<!-- IE 5-9 -->\r\n<div id=d><x xmlns=\"><iframe onload=alert(1)\"></div>\n<script>d.innerHTML+=\'\';</script>\r\n\r\n<!-- IE 10 in IE5-9 Standards mode -->\r\n<div id=d><x xmlns=\'\"><iframe onload=alert(2)//\'></div>\n<script>d.innerHTML+=\'\';</script>",
-	output: "\n<div id=\"d\"></div>\n\n\n\n<div id=\"d\"></div>\n"
+	output: "\n<div id=d></div>\n\n\n\n<div id=d></div>\n"
 },
 {
 	id: 99,
 	input: "<div id=d><div style=\"font-family:\'sans\\27\\2F\\2A\\22\\2A\\2F\\3B color\\3Ared\\3B\'\">X</div></div>\n<script>with(document.getElementById(\"d\"))innerHTML=innerHTML</script>",
-	output: "<div id=\"d\"><div style=\"font-family:\'sans\\27\\2F\\2A\\22\\2A\\2F\\3B color\\3Ared\\3B\'\">X</div></div>\n"
+	output: "<div id=d><div style=\"font-family:\'sans\\27\\2F\\2A\\22\\2A\\2F\\3B color\\3Ared\\3B\'\">X</div></div>\n"
 },
 {
 	id: 100,
@@ -510,12 +510,12 @@ var html5secVectors = [
 {
 	id: 102,
 	input: "<a href=\"[a]java[b]script[c]:alert(1)\">XXX</a>",
-	output: "<a href=\"%5Ba%5Djava%5Bb%5Dscript%5Bc%5D:alert(1)\">XXX</a>"
+	output: "<a href=\"[a]java[b]script[c]:alert(1)\">XXX</a>"
 },
 {
 	id: 103,
 	input: "<img src=\"x` `<script>alert(1)</script>\"` `>",
-	output: "<img src=\"x%60%20%60%3Cscript%3Ealert(1)%3C/script%3E\" />"
+	output: "<img src=\"x` `<script>alert(1)</script>\" />"
 },
 {
 	id: 104,
@@ -545,7 +545,7 @@ var html5secVectors = [
 {
 	id: 109,
 	input: "<!-- IE 5-8 standards mode -->\r\n<a href=http://foo.bar/#x=`y></a><img alt=\"`><img src=xx:x onerror=alert(1)></a>\">\r\n\r\n<!-- IE 5-9 standards mode -->\r\n<!a foo=x=`y><img alt=\"`><img src=xx:x onerror=alert(2)//\">\r\n<?a foo=x=`y><img alt=\"`><img src=xx:x onerror=alert(3)//\">",
-	output: "\n<a href=\"http://foo.bar/#x&#61;&#96;y\"></a><img alt=\"`><img src=xx:x onerror=alert(1)></a>\" />\n\n\n<img alt=\"`><img src=xx:x onerror=alert(2)//\" />\n<img alt=\"`><img src=xx:x onerror=alert(3)//\" />"
+	output: "\n<a href=http://foo.bar/#x&#61;&#96;y></a><img alt=\"`><img src=xx:x onerror=alert(1)></a>\" />\n\n\n<img alt=\"`><img src=xx:x onerror=alert(2)//\" />\n<img alt=\"`><img src=xx:x onerror=alert(3)//\" />"
 },
 {
 	id: 110,
@@ -628,12 +628,12 @@ var generalVectors = [
 {
 	id: 10,
 	input: "<table><tr bz/></table>normal tag made standalone with bogus trunc attr",
-	output: "<table><tr /></table>normal tag made standalone with bogus trunc attr"
+	output: "<table><tr></tr></table>normal tag made standalone with bogus trunc attr"
 },
 {
 	id: 11,
 	input: "<table><tr color/></table>normal tag made standalone with trunc attr bad val",
-	output: "<table><tr /></table>normal tag made standalone with trunc attr bad val"
+	output: "<table><tr></tr></table>normal tag made standalone with trunc attr bad val"
 },
 {
 	id: 12,
@@ -648,7 +648,7 @@ var generalVectors = [
 {
 	id: 14,
 	input: "<table><tr size=\"4\"/></table>normal tag made standalone with value",
-	output: "<table><tr size=\"4\" /></table>normal tag made standalone with value"
+	output: "<table><tr size=\"4\"></tr></table>normal tag made standalone with value"
 },
 //style attribute tests
 {
@@ -669,7 +669,7 @@ var generalVectors = [
 {
 	id: 18,
 	input: "<div style=' color: blue;'>rodent 2 is ok</div>",
-	output: "<div style=\" color: blue;\">rodent 2 is ok</div>"
+	output: "<div style=' color: blue;'>rodent 2 is ok</div>"
 },
 {
 	id: 19,
@@ -679,7 +679,7 @@ var generalVectors = [
 {
 	id: 20,
 	input: "<div style=' color: blue '>rodent 4 is ok</div>",
-	output: "<div style=\" color: blue \">rodent 4 is ok</div>"
+	output: "<div style=' color: blue '>rodent 4 is ok</div>"
 },
 {
 	id: 21,
@@ -699,7 +699,7 @@ var generalVectors = [
 {
 	id: 24,
 	input: "<div style=>no style value at all</div>",
-	output: "<div style=\"\">no style value at all</div>"
+	output: "<div style>no style value at all</div>"
 },
 {
 	id: 25,
@@ -734,7 +734,7 @@ var generalVectors = [
 {
 	id: 31,
 	input: "<div style=color:blue>unquoted style attribute</div>",
-	output: "<div style=\"color:blue\">unquoted style attribute</div>"
+	output: "<div style=color:blue>unquoted style attribute</div>"
 },
 {
 	id: 32,
@@ -779,7 +779,7 @@ var generalVectors = [
 {
 	id: 40,
 	input: "<option selected />",
-	output: "<option selected />"
+	output: "<option selected></option>"
 },
 {
 	id: 41,
@@ -799,17 +799,17 @@ var generalVectors = [
 {
 	id: 44,
 	input: "<option selected/>",
-	output: "<option selected />"
+	output: "<option selected></option>"
 },
 {
 	id: 45,
 	input: "<img id=\'foo\'/>",
-	output: "<img id=\"foo\" />"
+	output: "<img id=\'foo\' />"
 },
 {
 	id: 46,
 	input: "<img id=\'foo\' />",
-	output: "<img id=\"foo\" />"
+	output: "<img id=\'foo\' />"
 },
 {
 	id: 47,
@@ -819,7 +819,7 @@ var generalVectors = [
 {
 	id: 48,
 	input: "<img id=\'\' />",
-	output: "<img id=\"\" />"
+	output: "<img id=\'\' />"
 },
 {
 	id: 49,
@@ -831,6 +831,16 @@ var generalVectors = [
 	id: 50,
 	input: "abc <!-- 123",
 	output: "abc "
+},
+{
+	id: 51,
+	input: "<img src=\"x\" id=\'\" onerror=\"alert(1)\' />",
+	output: "<img src=\"x\" id=\'\" onerror=\"alert(1)\' />"
+},
+{
+	id: 52,
+	input: "<a href='http://www.yahoo.com/' />hello",
+	output: "<a href='http://www.yahoo.com/'>hello</a>"
 }
 ];