Improve embody behavior