should i rename @polaris to avoid confusion?