added autocalculate