some overall changes