some changes
init