Lots of source/sink restructuring.  Serial port is optional too.