changed support, refactoring