Modability improvements