adjusted more stuff