added better parser