Updated code for conversation