added full calculator