Changed a bit. Not done yet.