Updated the detection mechanic once again.