Added calculator and functions