added more messages and changed join