Need list changes, renaming controllers because of conficts