added capability and early ditching of it for security