v2 - Uses line parsing