Fixing Cory's stuff