Minor changes 8|