Yet another refactor, thanks to Landscape