make this more consistent