Added calculator and filter