improved safety & selector compability