even more improved file parsing