saving some work before changing branches. adding some timeouts