Replaced code with the working version

Committed wrong source file (oops)