Forgot to uncomment code from testing