Added calculator and offices