updated machado and stuff