Bold/modularize everything