Fixed so that agent init initiated things.
Fixed merge conflict.