changed weird code!!!