rearrange to use namespace