Working selector and updated RunGrid