Added simple security
Added somemore robustness