Fixed visibility for many methods