Changed all code