Changing to being non-modular