Added working parsing