Changed noCalc implementation to be cleaner.