Added more security features and stuff