Fixing units and adding communication prototypes.