Added Calculator and Call opportunities