have incorporated changes into main code