Transitional update

Attempts to fix overrun bug -- INCOMPLETE