Removed unused code.  Added real life time case.