insert and update working well now