Changes:
 - Some changes due to change of whisperer behavior