some modification for security app