mods to work with older layout