if it's a good time I would like to update the interlock screen for tests. Reorganize screen will follow after test