Revert "Removed commented variables."

This reverts commit 9627ced4ef96b699d277b3b08c81112e34ce7e43.
Latest working.