added message
merged file and message code