additional intent
code cleanup (I'm not sure it works fine)