WIP Updating for 1.8