Uncomment code masked for testing