some overall modifications
more modifications