added security and more