WIP: inc timeout to 60secs