Huge changes & Some bugs solved ...