added controller selection