Finished refactoring custom.