Emy's new changes :)