this is not part of this PR in general it is a good idea. Not sure if we should do it in basic app.