Prince/suraj | adding success and error messages.