adds Jay's original code back
adds Jay's original code