Still fixing completition