We will also need to update other resources so that they don't do this because i see several doing the same, of course it doesn't have to be part of this work.