Could we make this internal?