some reworks