NEW - error tollerance fixes