Oops, forgot to indent a bit and to remove some stuff.