continued & optimized parser