Update & rework