created function for update
fixexd conflict