import section parsing improved