added message structure and complete/delete