Modify the scheam and detector a bit more