fix condition
restructured, added injectionSelector