Worked on parsing routines