Post merge Fixes ; Rebinding Works