Better Unit Detection!