Final Elvisblock Fix

Everything should be good now.