Updated parser so it's a little faster
Updated parser so it's a little faster