Re-enabled all the commented code