WIP: Working on intensity limits