Moved earlier infrastucture thoughts