reorganization with more diff variables
adaptation