easing integration
refactoring