Updated to remove paranoia. :)