help refactoring. JAppDater integration.