reverted back to old detection system