System Change

Better logical structure