some changes.. lookup table, etc. parsing logic.