#22 address modification