Rework Properly