Changed to vector notation everywhere