Made everything more secure