Added message to closure && added change addresses