some changes to secure