Add timeouts, remove Separate function