Rework Implementation