Separate parse function in another function
Same as the last commit