Rewrote with (dynamic) modules only.