Fixed parser AND STOP REVERTING MY COMMITS