Updated with Cory's stuff.