Do we still want to make this environment aware?