Changed 2 things