Reverted the commented code