updating merge with blocks 8-21-2013.

made it more efficient.