Updated to include calculator example