start to fix cave problems, finish this way