LMK : Reverted some commits to see how it goes