Added: Preparing for more perms