Changed a few lines etc.