added variety to options
Merged methods in calculations
accepted occasion2 addition'