Revert "Alot of changes"