hopefully improved detection