Reenabled code I accidentally commented out