Switched code

Commented out previous code
Completed backup code and uncommented it