cammand safety fix + new version