Added code after discussion

Added code after discussion