Completed raw implementation