Updated code
Updated behavior code