Removed Vector stuff since it didn't actually speed things up at all