Changed even more things