Yes, ironically I didn't figure this out until I had already beat the game.