Updated floating functionality