added security and new filters and functions