Added calculator feature