Adding in changes from yesterday