Restored a lot of functionality.