Updating to make things work