rework + messaging