Some box detectino changes