Minor mods for multiple directions to test with