Last bit of calcs

gbless