Appears to be working as needed now.