Wolf updated code due to questions raised by community