Some functionality restored after major refactor