Fixed vectors... much simpler now!