Just a suggestion, though maybe you could make use of the going through the wall. When I went through, at first I thought I found a secret passage!