changed name, addes some more stuff