Reverted everyting except scripts