finishing implementation of missing units