Trying to fix the casing stuff