Don't use Vannilla functions anymore

To many issues with timeouts