Rearranged the methods
Code simplification
updated the TODO
Do not change PK field
Udated the PLAN
ff
ff