Selector has removed for now for later works