Updated to vector, Added Debug