Updated some behavior