5/8/14 - major changes to intensity functions