Changed facts to only do Self device