better code, but agents don't work
Merge origin/master