changed get_message method