Nicola Work AM 22.09.14

Moved API security checks to one side