Took Shifted Data Into Account!

Finally!