Assignment is updated according to your comment, please review