Changed parser system... again.