changed loads of stuff and forgot :D