After a little wire clean up.