new version with security