Additional changes due to what the heck happened