Checking in changes to make this more generic.