not working, trying to fix timeouts
really ugly fix