adjusted more things