This looks fragile - can we avoid the sleep?