Hope it will be less prone to site redesign