Changed a few things ;)