last2 commit - added units and some formatting