i will rework on this