changed the Hard coded strings to strings from values 
moved the notification to the Controller