Removed the NAN stuff. Makes me uneasy.