Added: raw implementation