Restored code from before bad push