Worked on function parsing