#215, #216 update address + remove file attachment