Mostly works, but corridors are buggy