Added second calculator and solution