is the 'raw' helper really necessary here?