added more to units. Error handling