ducksmanager's changes