Movement and visibility compatibility
Merging Oliver