Commented out some code for testing