update
add support for long messages
update