modified 2 things