Re-activate commented code