updates based upon latest testing