Simplified
Fixd
Optimized into the ant selector stuff