final (i hope) modifications