major changes, less functionality