Commented out some testing