rework on devframework