adding links + updated end_message