Comment out previous code to allow for testing