added full calculations