Moved stuff around, replacement vectors