Attempt at implementing new security