Now work better