Added calcs 4,6,7