Fixed Skip, Added SkipUntil