4/25/14 - changed intensity functions