Added own message handling for shore