Added basic functionality for stop calculator