roll back all changes

roll back all changes, i will rework for all requirements