Updated for upcoming star selector