updated machado - ie stuffs