comitting to resolve issue 98 and 99