Update and rework