Heads up : add Floating Mode support (1/2)