Better modularity, I guess?