adapt for new security stuff