changed parser return format