make it more secure
some changes