(FEATURE) Updated to be consistent and more secure and works everywhere.