More endstate stuff