ON parser modified