Slightly better done multiple times handling