I am not sure about the second the suggested mode, but in general this is something we should look at.