* Added a bit more security