Updating things to work