changed a bit here and there