Removed static, added sep controllers