implement Igawesome Igor recommendations