started dealing with #26