[ADDED] Intial selector implementation