udpate for null & array
update for convention