Selecton manager chnages to fit FF