final changes for security 
Build for test 13/11/2014